From 6489bc19297574099a2a341bcecb29ba02d29cf9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 23 Nov 2017 22:20:50 -0500 Subject: [PATCH] broadway: Remove devicemanager implementation It is not used and not needed anymore. --- gdk/broadway/gdkdevicemanager-broadway.c | 178 ----------------------- gdk/broadway/gdkdevicemanager-broadway.h | 53 ------- gdk/broadway/gdkdisplay-broadway.c | 3 - gdk/broadway/meson.build | 1 - 4 files changed, 235 deletions(-) delete mode 100644 gdk/broadway/gdkdevicemanager-broadway.c delete mode 100644 gdk/broadway/gdkdevicemanager-broadway.h diff --git a/gdk/broadway/gdkdevicemanager-broadway.c b/gdk/broadway/gdkdevicemanager-broadway.c deleted file mode 100644 index e9f8c55639..0000000000 --- a/gdk/broadway/gdkdevicemanager-broadway.c +++ /dev/null @@ -1,178 +0,0 @@ -/* GDK - The GIMP Drawing Kit - * Copyright (C) 2009 Carlos Garnacho - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -#include "config.h" - -#include "gdkdevicemanager-broadway.h" - -#include "gdktypes.h" -#include "gdkdevicemanager.h" -#include "gdkdevice-broadway.h" -#include "gdkkeysyms.h" -#include "gdkprivate-broadway.h" -#include "gdkseatdefaultprivate.h" - -#define HAS_FOCUS(toplevel) \ - ((toplevel)->has_focus || (toplevel)->has_pointer_focus) - -static void gdk_broadway_device_manager_finalize (GObject *object); -static void gdk_broadway_device_manager_constructed (GObject *object); - -static GList * gdk_broadway_device_manager_list_devices (GdkDeviceManager *device_manager, - GdkDeviceType type); -static GdkDevice * gdk_broadway_device_manager_get_client_pointer (GdkDeviceManager *device_manager); - -G_DEFINE_TYPE (GdkBroadwayDeviceManager, gdk_broadway_device_manager, GDK_TYPE_DEVICE_MANAGER) - -static void -gdk_broadway_device_manager_class_init (GdkBroadwayDeviceManagerClass *klass) -{ - GdkDeviceManagerClass *device_manager_class = GDK_DEVICE_MANAGER_CLASS (klass); - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->finalize = gdk_broadway_device_manager_finalize; - object_class->constructed = gdk_broadway_device_manager_constructed; - device_manager_class->list_devices = gdk_broadway_device_manager_list_devices; - device_manager_class->get_client_pointer = gdk_broadway_device_manager_get_client_pointer; -} - -static GdkDevice * -create_core_pointer (GdkDeviceManager *device_manager, - GdkDisplay *display) -{ - return g_object_new (GDK_TYPE_BROADWAY_DEVICE, - "name", "Core Pointer", - "type", GDK_DEVICE_TYPE_MASTER, - "input-source", GDK_SOURCE_MOUSE, - "input-mode", GDK_MODE_SCREEN, - "has-cursor", TRUE, - "display", display, - "device-manager", device_manager, - NULL); -} - -static GdkDevice * -create_core_keyboard (GdkDeviceManager *device_manager, - GdkDisplay *display) -{ - return g_object_new (GDK_TYPE_BROADWAY_DEVICE, - "name", "Core Keyboard", - "type", GDK_DEVICE_TYPE_MASTER, - "input-source", GDK_SOURCE_KEYBOARD, - "input-mode", GDK_MODE_SCREEN, - "has-cursor", FALSE, - "display", display, - "device-manager", device_manager, - NULL); -} - -static GdkDevice * -create_touchscreen (GdkDeviceManager *device_manager, - GdkDisplay *display) -{ - return g_object_new (GDK_TYPE_BROADWAY_DEVICE, - "name", "Touchscreen", - "type", GDK_DEVICE_TYPE_SLAVE, - "input-source", GDK_SOURCE_TOUCHSCREEN, - "input-mode", GDK_MODE_SCREEN, - "has-cursor", FALSE, - "display", display, - "device-manager", device_manager, - NULL); -} - -static void -gdk_broadway_device_manager_init (GdkBroadwayDeviceManager *device_manager) -{ -} - -static void -gdk_broadway_device_manager_finalize (GObject *object) -{ - GdkBroadwayDeviceManager *device_manager; - - device_manager = GDK_BROADWAY_DEVICE_MANAGER (object); - - g_object_unref (device_manager->core_pointer); - g_object_unref (device_manager->core_keyboard); - g_object_unref (device_manager->touchscreen); - - G_OBJECT_CLASS (gdk_broadway_device_manager_parent_class)->finalize (object); -} - -static void -gdk_broadway_device_manager_constructed (GObject *object) -{ - GdkBroadwayDeviceManager *device_manager; - GdkDisplay *display; - GdkSeat *seat; - - device_manager = GDK_BROADWAY_DEVICE_MANAGER (object); - display = gdk_device_manager_get_display (GDK_DEVICE_MANAGER (object)); - device_manager->core_pointer = create_core_pointer (GDK_DEVICE_MANAGER (device_manager), display); - device_manager->core_keyboard = create_core_keyboard (GDK_DEVICE_MANAGER (device_manager), display); - device_manager->touchscreen = create_touchscreen (GDK_DEVICE_MANAGER (device_manager), display); - - _gdk_device_set_associated_device (device_manager->core_pointer, device_manager->core_keyboard); - _gdk_device_set_associated_device (device_manager->core_keyboard, device_manager->core_pointer); - _gdk_device_set_associated_device (device_manager->touchscreen, device_manager->core_pointer); - _gdk_device_add_slave (device_manager->core_pointer, device_manager->touchscreen); - - seat = gdk_seat_default_new_for_master_pair (device_manager->core_pointer, - device_manager->core_keyboard); - gdk_display_add_seat (display, seat); - gdk_seat_default_add_slave (GDK_SEAT_DEFAULT (seat), device_manager->touchscreen); - g_object_unref (seat); -} - - -static GList * -gdk_broadway_device_manager_list_devices (GdkDeviceManager *device_manager, - GdkDeviceType type) -{ - GdkBroadwayDeviceManager *broadway_device_manager = (GdkBroadwayDeviceManager *) device_manager; - GList *devices = NULL; - - if (type == GDK_DEVICE_TYPE_MASTER) - { - devices = g_list_prepend (devices, broadway_device_manager->core_keyboard); - devices = g_list_prepend (devices, broadway_device_manager->core_pointer); - } - - if (type == GDK_DEVICE_TYPE_SLAVE) - { - devices = g_list_prepend (devices, broadway_device_manager->touchscreen); - } - - return devices; -} - -static GdkDevice * -gdk_broadway_device_manager_get_client_pointer (GdkDeviceManager *device_manager) -{ - GdkBroadwayDeviceManager *broadway_device_manager = (GdkBroadwayDeviceManager *) device_manager; - - return broadway_device_manager->core_pointer; -} - -GdkDeviceManager * -_gdk_broadway_device_manager_new (GdkDisplay *display) -{ - return g_object_new (GDK_TYPE_BROADWAY_DEVICE_MANAGER, - "display", display, - NULL); -} diff --git a/gdk/broadway/gdkdevicemanager-broadway.h b/gdk/broadway/gdkdevicemanager-broadway.h deleted file mode 100644 index 93bc2753dc..0000000000 --- a/gdk/broadway/gdkdevicemanager-broadway.h +++ /dev/null @@ -1,53 +0,0 @@ -/* GDK - The GIMP Drawing Kit - * Copyright (C) 2009 Carlos Garnacho - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -#ifndef __GDK_DEVICE_MANAGER_BROADWAY_H__ -#define __GDK_DEVICE_MANAGER_BROADWAY_H__ - -#include - -G_BEGIN_DECLS - -#define GDK_TYPE_BROADWAY_DEVICE_MANAGER (gdk_broadway_device_manager_get_type ()) -#define GDK_BROADWAY_DEVICE_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_BROADWAY_DEVICE_MANAGER, GdkBroadwayDeviceManager)) -#define GDK_BROADWAY_DEVICE_MANAGER_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), GDK_TYPE_BROADWAY_DEVICE_MANAGER, GdkBroadwayDeviceManagerClass)) -#define GDK_IS_BROADWAY_DEVICE_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_BROADWAY_DEVICE_MANAGER)) -#define GDK_IS_BROADWAY_DEVICE_MANAGER_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), GDK_TYPE_BROADWAY_DEVICE_MANAGER)) -#define GDK_BROADWAY_DEVICE_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_BROADWAY_DEVICE_MANAGER, GdkBroadwayDeviceManagerClass)) - -typedef struct _GdkBroadwayDeviceManager GdkBroadwayDeviceManager; -typedef struct _GdkBroadwayDeviceManagerClass GdkBroadwayDeviceManagerClass; - -struct _GdkBroadwayDeviceManager -{ - GdkDeviceManager parent_object; - GdkDevice *core_pointer; - GdkDevice *core_keyboard; - GdkDevice *touchscreen; -}; - -struct _GdkBroadwayDeviceManagerClass -{ - GdkDeviceManagerClass parent_class; -}; - -GType gdk_broadway_device_manager_get_type (void) G_GNUC_CONST; -GdkDeviceManager *_gdk_broadway_device_manager_new (GdkDisplay *display); - -G_END_DECLS - -#endif /* __GDK_DEVICE_MANAGER_BROADWAY_H__ */ diff --git a/gdk/broadway/gdkdisplay-broadway.c b/gdk/broadway/gdkdisplay-broadway.c index 1da5b7f63b..9eec2db507 100644 --- a/gdk/broadway/gdkdisplay-broadway.c +++ b/gdk/broadway/gdkdisplay-broadway.c @@ -29,7 +29,6 @@ #include "gdkmonitor-broadway.h" #include "gdkinternals.h" #include "gdkdeviceprivate.h" -#include "gdkdevicemanager-broadway.h" #include #include @@ -111,8 +110,6 @@ _gdk_broadway_display_open (const gchar *display_name) display = g_object_new (GDK_TYPE_BROADWAY_DISPLAY, NULL); broadway_display = GDK_BROADWAY_DISPLAY (display); - display->device_manager = _gdk_broadway_device_manager_new (display); - gdk_event_init (display); _gdk_broadway_display_init_dnd (display); diff --git a/gdk/broadway/meson.build b/gdk/broadway/meson.build index b95f63dcae..c1c0f72855 100644 --- a/gdk/broadway/meson.build +++ b/gdk/broadway/meson.build @@ -5,7 +5,6 @@ gdk_broadway_sources = files([ 'gdkbroadway-server.c', 'gdkcursor-broadway.c', 'gdkdevice-broadway.c', - 'gdkdevicemanager-broadway.c', 'gdkdisplay-broadway.c', 'gdkdnd-broadway.c', 'gdkeventsource.c', -- 2.30.2